Remove deprecated gtk_drag_set_default_icon

diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 244015faf5335dde3f6e2654928aa28289835d26..9a4ee30892be7588be054db253540ad160b4b7fe 100644 (file)
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -1820,16 +1820,6 @@ gtk_drag_set_icon_default (GdkDragContext    *context)
   gtk_drag_set_icon_stock (context, GTK_STOCK_DND, -2, -2);
 }
 
-void 
-gtk_drag_set_default_icon (GdkColormap   *colormap,
-                          GdkPixmap     *pixmap,
-                          GdkBitmap     *mask,
-                          gint           hot_x,
-                          gint           hot_y)
-{
-  g_warning ("gtk_drag_set_default_icon is not supported on Mac OS X.");
-}
-
 static void
 gtk_drag_source_info_destroy (GtkDragSourceInfo *info)
 {

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 75a750c4f7c4282acaade65a84dd2108cc1133cc..0c73e18e456dbc04216dd6efbf278a3ff0190a38 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3406,53 +3406,6 @@ gtk_drag_set_icon_default (GdkDragContext *context)
                              default_icon_hot_y);
 }
 
-/**
- * gtk_drag_set_default_icon:
- * @colormap: the colormap of the icon
- * @pixmap: the image data for the icon
- * @mask: (allow-none): the transparency mask for an image, or %NULL
- * @hot_x: The X offset within @widget of the hotspot.
- * @hot_y: The Y offset within @widget of the hotspot.
- * 
- * Changes the default drag icon. GTK+ retains references for the
- * arguments, and will release them when they are no longer needed.
- *
- * Deprecated: Change the default drag icon via the stock system by 
- *     changing the stock pixbuf for #GTK_STOCK_DND instead.
- **/
-void 
-gtk_drag_set_default_icon (GdkColormap   *colormap,
-                          GdkPixmap     *pixmap,
-                          GdkBitmap     *mask,
-                          gint           hot_x,
-                          gint           hot_y)
-{
-  g_return_if_fail (GDK_IS_COLORMAP (colormap));
-  g_return_if_fail (GDK_IS_PIXMAP (pixmap));
-  g_return_if_fail (!mask || GDK_IS_PIXMAP (mask));
-  
-  if (default_icon_colormap)
-    g_object_unref (default_icon_colormap);
-  if (default_icon_pixmap)
-    g_object_unref (default_icon_pixmap);
-  if (default_icon_mask)
-    g_object_unref (default_icon_mask);
-
-  default_icon_colormap = colormap;
-  g_object_ref (colormap);
-  
-  default_icon_pixmap = pixmap;
-  g_object_ref (pixmap);
-
-  default_icon_mask = mask;
-  if (mask)
-    g_object_ref (mask);
-  
-  default_icon_hot_x = hot_x;
-  default_icon_hot_y = hot_y;
-}
-
-
 /*************************************************************
  * _gtk_drag_source_handle_event:
  *     Called from widget event handling code on Drag events

diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 19af311411ebdc94d8b3cce7aa79949ddc35e5e7..72ab05919f40248107504c0d13516b2cdc1c1d23 100644 (file)
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -175,14 +175,6 @@ void _gtk_drag_source_handle_event (GtkWidget *widget,
 void _gtk_drag_dest_handle_event (GtkWidget *toplevel,
                                  GdkEvent  *event);
 
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_drag_set_default_icon (GdkColormap   *colormap,
-                               GdkPixmap     *pixmap,
-                               GdkBitmap     *mask,
-                               gint           hot_x,
-                               gint           hot_y);
-#endif /* !GTK_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __GTK_DND_H__ */